bitkeeper revision 1.1177.2.1 (420cdfe0gnE29cMitOCxShEE2d_lRA)

Sync w/ 2.0-testing changes.

Signed-off-by: cl349@cl.cam.ac.uk

diff --cc .rootkeys
index 6d1496d0d6cddfe46f5759548dcfb82a4060a006,f876ba5eece5920eedf0dee042e0c65604002b21..274a2aefead5ab6d7aed415c2e94cce689387db1
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -769,8 -555,8 +769,9 @@@
  40fcefb3yMSrZvApO9ToIi-iQwnchA tools/sv/images/xen.png
  41013a83z27rKvWIxAfUBMVZ1eDCDg tools/sv/inc/script.js
  40fcefb3zGC9XNBkSwTEobCoq8YClA tools/sv/inc/style.css
+ 420b963dK3yGNtqxRM8npGZtrCQd1g tools/vnet/00INSTALL
  41a21888_WlknVWjSxb32Fo13_ujsw tools/vnet/00README
 +420a9b706I-bN_uPdiy0m3rmDifNNg tools/vnet/INSTALL
  41a21888bOiOJc7blzRbe4MNJoaYTw tools/vnet/Makefile
  41a21888mg2k5HeiVjlQYEtJBZT4Qg tools/vnet/doc/vnet-module.txt
  41a21888cuxfT8wjCdRR6V1lqf5NtA tools/vnet/doc/vnet-xend.txt

diff --cc xen/arch/x86/extable.c
index 907590e6cbdc14e883a110def6daa5a4169f1627,bb70a3842b3ff5a0db17896249f0c921773f4a2e..8a0c0b81db89a499ae8d0525872e57f93872b2f0
--- 1/xen/arch/x86/extable.c
--- 2/xen/arch/x86/extable.c
+++ b/xen/arch/x86/extable.c
@@@ -63,10 -63,11 +63,11 @@@ search_exception_table(unsigned long ad
  }
  
  unsigned long
- search_pre_exception_table(unsigned long addr)
+ search_pre_exception_table(struct xen_regs *regs)
  {
+     unsigned long addr = (unsigned long)regs->eip;
      unsigned long fixup = search_one_table(
          __start___pre_ex_table, __stop___pre_ex_table-1, addr);
 -    DPRINTK("Pre-exception: %08lx -> %08lx\n", addr, fixup);
 +    DPRINTK("Pre-exception: %p -> %p\n", addr, fixup);
      return fixup;
  }

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge